specify user when query, format date
update initial data
refactor & fix