This MR creates a new index which will
improve the query performance and avoid
the query to timeout and return a 500.