Fixes and new features on basic searchs