Revert addition of DBSearch functionality as this is being worked on by Dulitha