Pankaj | #2031 #2365 |Fixed query, default values for prompt and formating changes