[ORB-16] refactored patient search function into basic/advanced forms
[ORB-16] advanced search tweaks