Improved JS searching