Improved search module