Refactoring handlers
Adding institution and datatype search links