dry out angular code
switch back to built in filter, additional custom filter to return empty if blank query
merge fix