Fix multi-column restrictions index queries