Did some tweaking to get make filtered search look better.