simplify adding/removing markers logic:

 * use cursor.observeChanges insted of cursor.observe;
   quote from docs:
     observeChanges is significantly more efficient
     if you do not use addedBefore or movedBefore
poprawki
resolved CONFLICT