diff --git a/aql2/src/aql.cpp b/aql2/src/aql.cpp
index 0a8b6433254ae21a5d3a1918761695e0706de64d..479ac365fb483437ab5e5da26b4682c11ba0e04a 100644
--- a/aql2/src/aql.cpp
+++ b/aql2/src/aql.cpp
@@ -51,8 +51,8 @@ int main ( int argc, char * argv[] ) {
 
 		TCLAP::CmdLine cmd ( "Algorithms query language binary", ' ', "0.01" );
 
-		TCLAP::ValueArg < std::string > query ( "q", "query", "Query index", false, "", "query" );
-		cmd.add ( query );
+		TCLAP::MultiArg < std::string > queries ( "q", "query", "Query string", false, "string" );
+		cmd.add ( queries );
 
 		TCLAP::SwitchArg measure ( "m", "measure", "Measure times", false );
 		cmd.add ( measure );
@@ -83,10 +83,14 @@ int main ( int argc, char * argv[] ) {
 		Prompt p ( std::move ( environment ) );
 
 		cli::Command::Result result = cli::Command::Result::OK;
-		if ( query.isSet ( ) )
-			result = p.execute_line ( query.getValue ( ) );
-		else
+		if ( queries.getValue ( ).empty ( ) ) {
 			result = p.run ( );
+		} else {
+			for ( const std::string & query : queries.getValue ( ) )
+				p.execute_line ( query );
+
+			result = cli::Command::Result::QUIT;
+		}
 
 		measurements::end ( );