fix class and function search