tweaked location search, added form search
various fixes
Merge branch 'master' of https://github.com/nf-crl/basic_scripts