Added new functionality : possibility to pass full query instead of extras