3512437 Add store paramater improve store selection logic

Added a store query that can be used in the URL Tried to improve logic when getting the current context / store

#3512437