MIFOS-5753: Added advanced options to Search functionality