Remove forced index and NOT NULL condition

As per Sean's recommendations

Change-Id: Id2f737e45ffadacff0e9fbfcadf9e7a0f92a03f7
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/596