2.2/develop - Add indexes for quick DB queries

Add indexes for quick DB queries.