added search fields and filters