Restrict selecting parameters of the improve search to non-root items
Fix the improve search