Add in search features

hook up type/keyword search options into search, minor tweaks/bugfixes on other files