#1 drop indices
#1 fix query result mapping