Add table show
fix query
fix query id
fix location