Take issue
Fix search
Add state changes