Improved searching API to have primary and secondary filters