While working on it, let's move out of the query also the start

Signed-off-by: emanuele <emanuele45@gmail.com>