Merge "Removed FORCE INDEX from API category queries"