Better handling of AND, use implicit AND

MongoDB's $and operator misses indexes, use implicit AND where possible