Remove obsolete query
Add index for entries