More work on 1.4 secondary index query