Add new Annotation and Fix

1- Add @QuerySelector annotation
2- Temporary fixes