Refactor WishController - remove DOM reference to directive