Added parsing input query