fixed classes working improved search