Fixed query composition
Fixed ajax forms