Skills can be very broad in scope - some more so than others. For instance, Ranged (Light) covers not only all the blaster pistols, but all other pistol sized weapons and thrown weapons like knives and thrown weapons like grenades. Athletics covers swimming, climbing, playing sports, lifting weights, jumping, running… Piloting (Planetary) includes speeders, walkers, bikes, airspeeders, boats… You get the idea.
I’m thinking about incorporating some kind of specialty or tag rule.
A PC “specializes” in starfighter racing. The Piloting (Space) skill covers freighters and shuttles too though. So she is really just as good at flying a garbage scow as she is a Z-95.
First draft idea: allow players to purchase a tag for 10xp. Pick a single aspect/specialty of a skill. When making checks involving that aspect/specialty, upgrade once.