Fix query all and and remove button