added more responsive queries and aliases