Avoid duplication in searches

Fixes to avoid duplication on both the skill search and asset search