Cperello/slap indexes

My dev server logs are full of warnings about not having those fields indexed.