Add indexes for primary keys, better query for stops