Fixing custom var search