Fixes searchby functionality