Remove shortcut dependendy.
Add query alter but comment it in.