Tag saving works, showing results does not
Fixed merge conflicts