[653] Fix the query to make sure we get everything, strangely some of the resources *appear* to not have cache_filepath but they do upon querying