Fixing keyword search in task/form resource