Fix for sub item search