query error
Bug on buttons fixed