fixed annotation order + added filter tools