Improved search. added filters