diff --git a/digimarks.py b/digimarks.py
index 4d4a9b8..e4cb5bd 100644
--- a/digimarks.py
+++ b/digimarks.py
@@ -260,8 +260,9 @@ def index():
 
 
 @app.route('/<userkey>', methods=['GET', 'POST'])
+@app.route('/<userkey>/filter/<filtermethod>', methods=['GET', 'POST'])
 @app.route('/<userkey>/sort/<sortmethod>', methods=['GET', 'POST'])
-def bookmarks(userkey, sortmethod = None):
+def bookmarks(userkey, filtermethod = None, sortmethod = None):
     """ User homepage, list their bookmarks, optionally filtered and/or sorted """
     #return object_list('bookmarks.html', Bookmark.select())
     #user = User.select(key=userkey)
@@ -273,14 +274,31 @@ def bookmarks(userkey, sortmethod = None):
     message = request.args.get('message')
     tags = get_cached_tags(userkey)
 
-    if request.method == 'POST':
-        filter_on = request.form['filter']
-        bookmarks = Bookmark.select().where(Bookmark.userkey == userkey, Bookmark.title.contains(filter_on),
+    filter_text = None
+    if request.form:
+        filter_text = request.form['filter_text']
+
+    filter_starred = False
+    if filtermethod and filtermethod.lower() == 'starred':
+        filter_starred = True
+
+    filter_broken = False
+    if filtermethod and filtermethod.lower() == 'broken':
+        filter_broken = True
+
+    if filter_text:
+        bookmarks = Bookmark.select().where(Bookmark.userkey == userkey, Bookmark.title.contains(filter_text),
                                             Bookmark.status == Bookmark.VISIBLE).order_by(Bookmark.created_date.desc())
-        return render_template('bookmarks.html', bookmarks=bookmarks, userkey=userkey, tags=tags, filter=filter_on, message=message)
+    elif filter_starred:
+        bookmarks = Bookmark.select().where(Bookmark.userkey == userkey,
+                                            Bookmark.starred == True).order_by(Bookmark.created_date.desc())
+    elif filter_broken:
+        bookmarks = Bookmark.select().where(Bookmark.userkey == userkey,
+                                            Bookmark.http_status != 200).order_by(Bookmark.created_date.desc())
     else:
         bookmarks = Bookmark.select().where(Bookmark.userkey == userkey, Bookmark.status == Bookmark.VISIBLE).order_by(Bookmark.created_date.desc())
-        return render_template('bookmarks.html', bookmarks=bookmarks, userkey=userkey, tags=tags, message=message)
+
+    return render_template('bookmarks.html', bookmarks=bookmarks, userkey=userkey, tags=tags, filter_text=filter_text, message=message)
 
 
 
diff --git a/templates/bookmarks.html b/templates/bookmarks.html
index 0c44de4..93d11b6 100644
--- a/templates/bookmarks.html
+++ b/templates/bookmarks.html
@@ -35,7 +35,7 @@
 <div class="row">
     <form action="{{ url_for('bookmarks', userkey=userkey) }}" method="POST">
         <div class="input-field col l10 m10 s8">
-            <input placeholder="filter" type="text" name="filter" id="filter" value="{{ filter }}" class="validate" />
+            <input placeholder="filter_text" type="text" name="filter_text" id="filter_text" value="{{ filter_text }}" class="validate" />
         </div>
 
         <div class="input-field col l2 m2 s4">
@@ -47,6 +47,12 @@
 {% if tags %}
 <div class="row">
     <p>
+    <div class="chip">
+        <a href="{{ url_for('bookmarks', userkey=userkey, filtermethod='starred') }}"><i class="tiny material-icons yellow-text">star</i></a>
+    </div>
+    <div class="chip">
+        <a href="{{ url_for('bookmarks', userkey=userkey, filtermethod='broken') }}"><i class="tiny material-icons red-text">report_problem</i></a>
+    </div>
     {% for tag in tags %}
     <div class="chip">
         <a href="{{ url_for('tag', userkey=userkey, tag=tag) }}">{{ tag }}</a>