Armen housekeeping

cleaning things up plus fixed the bug we were having with the results search.