added username query
fixed changes