- Fixed the tomcat search function and optimized it's speed