Fix to join and remove buttons not rendering properly
Filter query works