fixed form reveal bug, started search refactor