Modified  to support queries using the "*:*" notation