Code refactoring.
Added the onwer_user_id to appear in queries