fix query
add index page